From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 6 Dec 2017 14:55:21 +0000 (+0100)
Subject: phase2: abort if ccache or dl/ setup failed
X-Git-Tag: v1~164
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=0b7a8028b4ab48bfde3de1d9f4492de0659ea5a8;p=buildbot.git

phase2: abort if ccache or dl/ setup failed

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 49e8e76..fc9f638 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -303,7 +303,8 @@ for arch in arches:
 	factory.addStep(ShellCommand(
 		name = "mkdldir",
 		description = "Preparing download directory",
-		command = ["sh", "-c", "mkdir -p $HOME/dl && rm -rf ./sdk/dl && ln -sf $HOME/dl ./sdk/dl"]))
+		command = ["sh", "-c", "mkdir -p $HOME/dl && rm -rf ./sdk/dl && ln -sf $HOME/dl ./sdk/dl"],
+		haltOnFailure = True))
 
 	factory.addStep(ShellCommand(
 		name = "mkconf",
@@ -320,7 +321,8 @@ for arch in arches:
 		name = "prepccache",
 		description = "Preparing ccache",
 		workdir = "build/sdk",
-		command = ["./ccache.sh"]))
+		command = ["./ccache.sh"],
+		haltOnFailure = True))
 
 	factory.addStep(ShellCommand(
 		name = "updatefeeds",